Skip to content

zEntPlayerBungeeState: Matches for Several Functions#564

Merged
mattbruv merged 4 commits intobfbbdecomp:mainfrom
JoshSanch:bungeeState
May 23, 2025
Merged

zEntPlayerBungeeState: Matches for Several Functions#564
mattbruv merged 4 commits intobfbbdecomp:mainfrom
JoshSanch:bungeeState

Conversation

@JoshSanch
Copy link
Collaborator

Also includes tweaks to xLightKit and xVec3.

@bfbbdecomp bfbbdecomp deleted a comment from github-actions bot May 22, 2025
@github-actions
Copy link

⚠️ 🔥

+2541 bytes
🆗 Bot Rating: Amazing contribution, you are the decomp GOAT 🐐

Regressions: 21

⚠️ main/SB/Core/x/xAnim - .rodata -5 bytes -> 97.03%
⚠️ main/SB/Core/x/xFont - .rodata -1 bytes -> 72.52%
⚠️ main/SB/Core/x/xFX - .rodata -2 bytes -> 27.07%
⚠️ main/SB/Game/zLightning - .rodata -2 bytes -> 97.66%
⚠️ main/SB/Game/zSaveLoad - .rodata -5 bytes -> 99.66%
⚠️ main/SB/Game/zUI - .rodata -3 bytes -> 99.45%
⚠️ main/SB/Core/gc/iAnim - .rodata -2 bytes -> 85.71%
⚠️ main/SB/Core/gc/iEnv - .rodata -4 bytes -> 80.00%
⚠️ main/SB/Core/gc/isavegame - .rodata -5 bytes -> 99.98%
⚠️ main/SB/Game/zNPCGoals - .rodata -2137 bytes -> 0.67%
⚠️ main/SB/Game/zNPCTypes - .rodata -841 bytes -> 1.67%
⚠️ main/SB/Game/zNPCTypeAmbient - .rodata -5 bytes -> 86.61%
⚠️ main/SB/Game/zNPCTypeDuplotron - .rodata -3 bytes -> 30.48%
⚠️ main/SB/Game/zShrapnel - .rodata -1 bytes -> 89.95%
⚠️ main/SB/Game/zEntTeleportBox - .rodata -5 bytes -> 98.25%
⚠️ main/SB/Game/zNPCTypeSubBoss - .rodata -3 bytes -> 96.02%
⚠️ main/SB/Game/zNPCTypeBoss - .rodata -5 bytes -> 97.84%
⚠️ main/SB/Game/zNPCTypeBossSandy - .rodata -89 bytes -> 35.02%
⚠️ main/SB/Game/zNPCTypeBossSB1 - .rodata -5 bytes -> 96.95%
⚠️ main/SB/Game/zNPCTypeBossPatrick - .rodata -70 bytes -> 93.44%
⚠️ main/SB/Game/zNPCGlyph - .rodata -6 bytes -> 97.91%

Progress: 64

📈 main/SB/Game/zEntPlayerBungeeState - .text +1656 bytes -> 39.46%
📈 main/SB/Game/zNPCMgr - .rodata +23 bytes -> 0.45%
📈 main/SB/Game/zMain - .rodata +7 bytes -> 86.56%
📈 main/SB/Game/zNPCTypeKingJelly - .rodata +23 bytes -> 3.35%
📈 main/SB/Game/zNPCFXCinematic - .rodata +21 bytes -> 12.30%
📈 main/SB/Game/zNPCTypeBossPlankton - .rodata +38 bytes -> 1.13%
📈 main/SB/Game/zEntCruiseBubble - .rodata +7 bytes -> 89.01%
📈 main/SB/Game/zEntPlayerBungeeState - .rodata +12 bytes -> 65.48%
📈 main/SB/Game/zGame - .rodata +6 bytes -> 96.17%
📈 main/SB/Game/zNPCTypeRobot - .rodata +11 bytes -> 59.09%
📈 main/SB/Game/zNPCTypeVillager - .rodata +8 bytes -> 80.04%
📈 main/SB/Game/zVar - .rodata +16 bytes -> 33.27%
📈 main/SB/Game/zEntPlayerOOBState - .rodata +23 bytes -> 3.69%
📈 main/SB/Game/zNPCHazard - .rodata +23 bytes -> 1.44%
📈 main/SB/Game/zNPCTypeCommon - .rodata +23 bytes -> 1.47%
📈 main/SB/Core/x/xEntMotion - .rodata +23 bytes -> 3.88%
📈 main/SB/Game/zNPCSupplement - .rodata +23 bytes -> 1.97%
📈 main/SB/Game/zNPCSupport - .rodata +20 bytes -> 14.14%
📈 main/SB/Game/zFX - .rodata +23 bytes -> 2.17%
📈 main/SB/Game/zAssetTypes - .rodata +2 bytes -> 99.07%
📈 main/SB/Core/x/xTRC - .rodata +23 bytes -> 2.40%
📈 main/SB/Game/zNPCGoalRobo - .rodata +23 bytes -> 5.10%
📈 main/SB/Core/x/xParEmitterType - .rodata +23 bytes -> 4.35%
📈 main/SB/Game/zDispatcher - .rodata +23 bytes -> 4.44%
📈 main/SB/Core/x/xHud - .rodata +21 bytes -> 13.08%
📈 main/SB/Game/zNPCSndTable - .rodata +23 bytes -> 4.92%
📈 main/SB/Game/zThrown - .rodata +23 bytes -> 5.47%
📈 main/SB/Game/zHud - .rodata +23 bytes -> 5.63%
📈 main/SB/Core/x/xCamera - .rodata +23 bytes -> 5.94%
📈 main/SB/Game/zGrid - .rodata +23 bytes -> 7.16%
📈 main/SB/Game/zNPCGoalVillager - .rodata +7 bytes -> 91.55%
📈 main/SB/Game/zCombo - .rodata +23 bytes -> 8.05%
📈 main/SB/Game/zNPCSpawner - .rodata +10 bytes -> 68.49%
📈 main/SB/Game/zEntHangable - .rodata +10 bytes -> 68.66%
📈 main/SB/Game/zNPCTypeTiki - .rodata +10 bytes -> 74.24%
📈 main/SB/Core/x/xMath3 - .rodata +16 bytes -> 40.00%
📈 main/SB/Game/zDiscoFloor - .rodata +21 bytes -> 24.74%
📈 main/SB/Game/zUIFont - .rodata +3 bytes -> 94.64%
📈 main/SB/Core/x/xEntBoulder - .rodata +9 bytes -> 11.49%
📈 main/SB/Core/x/xParEmitter - .rodata +13 bytes -> 21.33%
main/SB/Core/x/xAnim - .sdata2 +4 bytes -> 100.00%
📈 main/SB/Core/x/xHudFontMeter - .rodata +22 bytes -> 39.34%
📈 main/SB/Core/x/xCutscene - .rodata +21 bytes -> 44.44%
📈 main/SB/Core/gc/iModel - .rodata +19 bytes -> 40.00%
📈 main/SB/Core/x/xParSys - .rodata +20 bytes -> 42.86%
📈 main/SB/Core/x/xHudUnitMeter - .rodata +3 bytes -> 7.69%
📈 main/SB/Core/gc/iSnd - .rodata +4 bytes -> 11.54%
📈 main/SB/Core/x/xScrFx - .rodata +3 bytes -> 9.76%
📈 main/SB/Game/zLight - .rodata +3 bytes -> 10.81%
📈 main/SB/Core/x/xCollide - .rodata +16 bytes -> 66.67%
📈 main/SB/Core/x/xShadow - .rodata +16 bytes -> 66.67%
📈 main/SB/Core/gc/iAnimSKB - .rodata +16 bytes -> 66.67%
📈 main/SB/Core/x/xSpline - .rodata +13 bytes -> 85.71%
main/SB/Core/x/xNPCBasic - .rodata +16 bytes -> 100.00%
📈 main/SB/Core/x/xShadowSimple - .rodata +1 bytes -> 8.00%
main/SB/Core/x/xLaserBolt - .rodata +16 bytes -> 100.00%
📈 main/SB/Game/zNPCGoalAmbient - .rodata +8 bytes -> 50.00%
📈 main/SB/Game/zEGenerator - .rodata +2 bytes -> 25.00%
📈 main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::update_vmovement(float) +152 bytes -> 20.88%
📈 main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::start_detaching() +320 bytes -> 55.17%
main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::detach_update(xScene&, float&) +428 bytes -> 100.00%
📈 main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::calc_movement(float&, float&, float&, float, float, float, float, float, float) +308 bytes -> 87.50%
main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::update_detach_camera(float) +280 bytes -> 100.00%
main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::update_heading(float) +168 bytes -> 100.00%

@JoshSanch
Copy link
Collaborator Author

Is this the result of my xVec3 changes?? 😵‍💫😵‍💫😵‍💫

@bfbbdecomp bfbbdecomp deleted a comment from github-actions bot May 22, 2025
@stravant
Copy link
Collaborator

stravant commented May 22, 2025

If you want to include it, put the cross definition in xCollide which is the compilation unit it shows up in, that will fix the regressions.

It's easier to sort out what may or may not be inline later.

@mattbruv mattbruv merged commit 6078f98 into bfbbdecomp:main May 23, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants